Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Automation: main-next integrate #16498

Closed
wants to merge 1 commit into from
Closed

Automation: main-next integrate #16498

wants to merge 1 commit into from

Conversation

msfluid-bot
Copy link
Collaborator

main-next integrate PR

The aim of this pull request is to sync main and next branch. This branch has MERGE CONFLICTS with next due to this commit. If this PR is assigned to you, you need to do the following:

  • Acknowledge the pull request by adding a comment -- "Actively working on it".
  • Merge next into this branch, main-next-64023ca.
  • Resolve any merge conflicts between main-next-64023ca and next and then push the results to upstream. Do NOT rebase or squash this branch: its history must be preserved.
  • Address any CI failures.
  • Recommended git commands:
    • git checkout main-next-64023ca -- check out the PR branch.
    • git merge next -- merge next into main-next-64023ca
    • RESOLVE MERGE CONFLICTS
    • git add . -- stage all the local changes
    • git commit -m Automation: main-next integrate -- commit the merge
    • git push upstream -- and push it to upstream (your upstream remote name may be different)

This change deprecates our internal TelemetryLogger implementations and
unifies our exported and consumed surface area on our telemetry
interfaces.

For the deprecated implementations the following replacement function
should be used:

- replace ChildLogger.create, new TelemetryNullLogger, and new
BaseTelemetryNullLogger with createChildLogger
-   replace DebugLogger.create with createDebugLogger
-   replace new MultiSinkLogger with createMultiSinkLogger
-   replace TelemetryUTLogger with MockLogger

---------

Co-authored-by: Tony Murphy <anthonm@microsoft.com>
Co-authored-by: Alex Villarreal <716334+alexvy86@users.noreply.github.com>
Co-authored-by: Mark Fields <markfields@users.noreply.github.com>
@msfluid-bot msfluid-bot requested review from a team as code owners July 20, 2023 20:39
@github-actions github-actions bot added area: dds Issues related to distributed data structures area: dds: sharedstring area: dds: tree area: driver Driver related issues area: framework Framework is a tag for issues involving the developer framework. Eg Aqueduct area: loader Loader related issues area: odsp-driver area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc public api change Changes to a public API base: next PRs targeted against next branch labels Jul 20, 2023
@tylerbutler
Copy link
Member

@anthony-murphy You can ignore this PR. I'll open a new one. We're making some minor changes to the tool and i think this change will benefit from them. We'll open a new one shortly.

Copy link
Member

@tylerbutler tylerbutler left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't merge. We'll open a new PR.

@tylerbutler tylerbutler deleted the main-next-64023ca branch July 20, 2023 21:21
@msfluid-bot msfluid-bot restored the main-next-64023ca branch July 20, 2023 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area: dds: sharedstring area: dds: tree area: dds Issues related to distributed data structures area: driver Driver related issues area: framework Framework is a tag for issues involving the developer framework. Eg Aqueduct area: loader Loader related issues area: odsp-driver area: runtime Runtime related issues area: tests Tests to add, test infrastructure improvements, etc base: next PRs targeted against next branch main-next-integrate merge-conflict public api change Changes to a public API
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants